Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 02:31:26 +0000 (18:31 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 02:31:26 +0000 (18:31 -0800)

Trivial merge